Fix introspection

Calling our get_type functions without prior gtk_init() is not ok,
and causes warnings now. Avoid that by teaching g-ir-scanner to
put a gtk_init() call into its generated code.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4fd509cdac9c98da303d0acb4be0a98280e04e72..506e17185d8a224a38292d6ab71ba823afd1c08b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1366,7 +1366,7 @@ introspection_files += \
 endif
 
 include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_SCANNER_ENV = CC="$(CC)"
+INTROSPECTION_SCANNER_ENV = CC="$(CC)" CPPFLAGS="-I$(top_srcdir) -I$(top_builddir) -I. -include gtk.h"
 INTROSPECTION_COMPILER_ARGS = \
        --includedir=$(srcdir) \
        --includedir=. \
@@ -1376,6 +1376,7 @@ Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gi
 Gtk_3_0_gir_SCANNERFLAGS =                     \
        --warn-all                              \
        --add-include-path=$(top_builddir)/gdk  \
+       --add-init-section="gtk_init (NULL, NULL);" \
        --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
 Gtk_3_0_gir_INCLUDES = Atk-1.0
 if USE_X11